From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Jun 2011 00:58:31 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3446^2~19
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=81211a6cc21dc2f51faa4d255c94a909fd70636f;p=emacs.git

Merge from trunk.
---

81211a6cc21dc2f51faa4d255c94a909fd70636f